- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander)
 - Add '-d invalid_mem' logging option (Zoltan)
 - Create QOM containers explicitly (Peter)
 - Rename sysemu/ -> system/ (Philippe)
 - Re-orderning of include/exec/ headers (Philippe)
   Move a lot of declarations from these legacy mixed bag headers:
     . "exec/cpu-all.h"
     . "exec/cpu-common.h"
     . "exec/cpu-defs.h"
     . "exec/exec-all.h"
     . "exec/translate-all"
   to these more specific ones:
     . "exec/page-protection.h"
     . "exec/translation-block.h"
     . "user/cpu_loop.h"
     . "user/guest-host.h"
     . "user/page-protection.h"
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t
 wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt
 KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K
 A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8
 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe///
 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r
 xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl
 VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay
 ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP
 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd
 +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6
 x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo=
 =cjz8
 -----END PGP SIGNATURE-----
Merge tag 'exec-20241220' of https://github.com/philmd/qemu into staging
Accel & Exec patch queue
- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander)
- Add '-d invalid_mem' logging option (Zoltan)
- Create QOM containers explicitly (Peter)
- Rename sysemu/ -> system/ (Philippe)
- Re-orderning of include/exec/ headers (Philippe)
  Move a lot of declarations from these legacy mixed bag headers:
    . "exec/cpu-all.h"
    . "exec/cpu-common.h"
    . "exec/cpu-defs.h"
    . "exec/exec-all.h"
    . "exec/translate-all"
  to these more specific ones:
    . "exec/page-protection.h"
    . "exec/translation-block.h"
    . "user/cpu_loop.h"
    . "user/guest-host.h"
    . "user/page-protection.h"
 # -----BEGIN PGP SIGNATURE-----
 #
 # iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t
 # wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt
 # KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K
 # A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8
 # 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe///
 # 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r
 # xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl
 # VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay
 # ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP
 # 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd
 # +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6
 # x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo=
 # =cjz8
 # -----END PGP SIGNATURE-----
 # gpg: Signature made Fri 20 Dec 2024 11:45:20 EST
 # gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
 # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [unknown]
 # gpg: WARNING: This key is not certified with a trusted signature!
 # gpg:          There is no indication that the signature belongs to the owner.
 # Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE
* tag 'exec-20241220' of https://github.com/philmd/qemu: (59 commits)
  util/qemu-timer: fix indentation
  meson: Do not define CONFIG_DEVICES on user emulation
  system/accel-ops: Remove unnecessary 'exec/cpu-common.h' header
  system/numa: Remove unnecessary 'exec/cpu-common.h' header
  hw/xen: Remove unnecessary 'exec/cpu-common.h' header
  target/mips: Drop left-over comment about Jazz machine
  target/mips: Remove tswap() calls in semihosting uhi_fstat_cb()
  target/xtensa: Remove tswap() calls in semihosting simcall() helper
  accel/tcg: Un-inline translator_is_same_page()
  accel/tcg: Include missing 'exec/translation-block.h' header
  accel/tcg: Move tcg_cflags_has/set() to 'exec/translation-block.h'
  accel/tcg: Restrict curr_cflags() declaration to 'internal-common.h'
  qemu/coroutine: Include missing 'qemu/atomic.h' header
  exec/translation-block: Include missing 'qemu/atomic.h' header
  accel/tcg: Declare cpu_loop_exit_requested() in 'exec/cpu-common.h'
  exec/cpu-all: Include 'cpu.h' earlier so MMU_USER_IDX is always defined
  target/sparc: Move sparc_restore_state_to_opc() to cpu.c
  target/sparc: Uninline cpu_get_tb_cpu_state()
  target/loongarch: Declare loongarch_cpu_dump_state() locally
  user: Move various declarations out of 'exec/exec-all.h'
  ...
Conflicts:
	hw/char/riscv_htif.c
	hw/intc/riscv_aplic.c
	target/s390x/cpu.c
	Apply sysemu header path changes to not in the pull request.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
		
	
			
		
			
				
	
	
		
			144 lines
		
	
	
		
			4.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			144 lines
		
	
	
		
			4.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * USB Mass Storage Device emulation
 | 
						|
 *
 | 
						|
 * Copyright (c) 2006 CodeSourcery.
 | 
						|
 * Written by Paul Brook
 | 
						|
 *
 | 
						|
 * This code is licensed under the LGPL.
 | 
						|
 */
 | 
						|
 | 
						|
#include "qemu/osdep.h"
 | 
						|
#include "qapi/error.h"
 | 
						|
#include "qapi/visitor.h"
 | 
						|
#include "hw/usb.h"
 | 
						|
#include "hw/usb/desc.h"
 | 
						|
#include "hw/usb/msd.h"
 | 
						|
#include "system/system.h"
 | 
						|
#include "system/block-backend.h"
 | 
						|
 | 
						|
static const struct SCSIBusInfo usb_msd_scsi_info_storage = {
 | 
						|
    .tcq = false,
 | 
						|
    .max_target = 0,
 | 
						|
    .max_lun = 0,
 | 
						|
 | 
						|
    .transfer_data = usb_msd_transfer_data,
 | 
						|
    .complete = usb_msd_command_complete,
 | 
						|
    .cancel = usb_msd_request_cancelled,
 | 
						|
    .load_request = usb_msd_load_request,
 | 
						|
};
 | 
						|
 | 
						|
static void usb_msd_storage_realize(USBDevice *dev, Error **errp)
 | 
						|
{
 | 
						|
    MSDState *s = USB_STORAGE_DEV(dev);
 | 
						|
    BlockBackend *blk = s->conf.blk;
 | 
						|
    SCSIDevice *scsi_dev;
 | 
						|
 | 
						|
    if (!blk) {
 | 
						|
        error_setg(errp, "drive property not set");
 | 
						|
        return;
 | 
						|
    }
 | 
						|
 | 
						|
    /*
 | 
						|
     * Hack alert: this pretends to be a block device, but it's really
 | 
						|
     * a SCSI bus that can serve only a single device, which it
 | 
						|
     * creates automatically.  But first it needs to detach from its
 | 
						|
     * blockdev, or else scsi_bus_legacy_add_drive() dies when it
 | 
						|
     * attaches again. We also need to take another reference so that
 | 
						|
     * blk_detach_dev() doesn't free blk while we still need it.
 | 
						|
     *
 | 
						|
     * The hack is probably a bad idea.
 | 
						|
     */
 | 
						|
    blk_ref(blk);
 | 
						|
    blk_detach_dev(blk, DEVICE(s));
 | 
						|
    s->conf.blk = NULL;
 | 
						|
 | 
						|
    usb_desc_create_serial(dev);
 | 
						|
    usb_desc_init(dev);
 | 
						|
    dev->flags |= (1 << USB_DEV_FLAG_IS_SCSI_STORAGE);
 | 
						|
    scsi_bus_init(&s->bus, sizeof(s->bus), DEVICE(dev),
 | 
						|
                 &usb_msd_scsi_info_storage);
 | 
						|
    scsi_dev = scsi_bus_legacy_add_drive(&s->bus, blk, 0, !!s->removable,
 | 
						|
                                         &s->conf, dev->serial, errp);
 | 
						|
    blk_unref(blk);
 | 
						|
    if (!scsi_dev) {
 | 
						|
        return;
 | 
						|
    }
 | 
						|
    usb_msd_handle_reset(dev);
 | 
						|
    s->scsi_dev = scsi_dev;
 | 
						|
}
 | 
						|
 | 
						|
static const Property msd_properties[] = {
 | 
						|
    DEFINE_BLOCK_PROPERTIES(MSDState, conf),
 | 
						|
    DEFINE_BLOCK_ERROR_PROPERTIES(MSDState, conf),
 | 
						|
    DEFINE_PROP_BOOL("removable", MSDState, removable, false),
 | 
						|
    DEFINE_PROP_BOOL("commandlog", MSDState, commandlog, false),
 | 
						|
};
 | 
						|
 | 
						|
static void usb_msd_class_storage_initfn(ObjectClass *klass, void *data)
 | 
						|
{
 | 
						|
    DeviceClass *dc = DEVICE_CLASS(klass);
 | 
						|
    USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
 | 
						|
 | 
						|
    uc->realize = usb_msd_storage_realize;
 | 
						|
    device_class_set_props(dc, msd_properties);
 | 
						|
}
 | 
						|
 | 
						|
static void usb_msd_get_bootindex(Object *obj, Visitor *v, const char *name,
 | 
						|
                                  void *opaque, Error **errp)
 | 
						|
{
 | 
						|
    USBDevice *dev = USB_DEVICE(obj);
 | 
						|
    MSDState *s = USB_STORAGE_DEV(dev);
 | 
						|
 | 
						|
    visit_type_int32(v, name, &s->conf.bootindex, errp);
 | 
						|
}
 | 
						|
 | 
						|
static void usb_msd_set_bootindex(Object *obj, Visitor *v, const char *name,
 | 
						|
                                  void *opaque, Error **errp)
 | 
						|
{
 | 
						|
    USBDevice *dev = USB_DEVICE(obj);
 | 
						|
    MSDState *s = USB_STORAGE_DEV(dev);
 | 
						|
    int32_t boot_index;
 | 
						|
    Error *local_err = NULL;
 | 
						|
 | 
						|
    if (!visit_type_int32(v, name, &boot_index, errp)) {
 | 
						|
        return;
 | 
						|
    }
 | 
						|
    /* check whether bootindex is present in fw_boot_order list  */
 | 
						|
    check_boot_index(boot_index, &local_err);
 | 
						|
    if (local_err) {
 | 
						|
        goto out;
 | 
						|
    }
 | 
						|
    /* change bootindex to a new one */
 | 
						|
    s->conf.bootindex = boot_index;
 | 
						|
 | 
						|
    if (s->scsi_dev) {
 | 
						|
        object_property_set_int(OBJECT(s->scsi_dev), "bootindex", boot_index,
 | 
						|
                                &error_abort);
 | 
						|
    }
 | 
						|
 | 
						|
out:
 | 
						|
    error_propagate(errp, local_err);
 | 
						|
}
 | 
						|
 | 
						|
static void usb_msd_instance_init(Object *obj)
 | 
						|
{
 | 
						|
    object_property_add(obj, "bootindex", "int32",
 | 
						|
                        usb_msd_get_bootindex,
 | 
						|
                        usb_msd_set_bootindex, NULL, NULL);
 | 
						|
    object_property_set_int(obj, "bootindex", -1, NULL);
 | 
						|
}
 | 
						|
 | 
						|
static const TypeInfo msd_info = {
 | 
						|
    .name          = "usb-storage",
 | 
						|
    .parent        = TYPE_USB_STORAGE,
 | 
						|
    .class_init    = usb_msd_class_storage_initfn,
 | 
						|
    .instance_init = usb_msd_instance_init,
 | 
						|
};
 | 
						|
 | 
						|
static void register_types(void)
 | 
						|
{
 | 
						|
    type_register_static(&msd_info);
 | 
						|
}
 | 
						|
 | 
						|
type_init(register_types)
 |