diff mbox

[4/4] q35: introduce q35-lite

Message ID 1478330391-74060-5-git-send-email-chao.p.peng@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Chao Peng Nov. 5, 2016, 7:19 a.m. UTC
This patch introduces a light weight machine type which shares the
same codebase with existing q35 machine type but with some features
disabled by default.

Signed-off-by: Chao Peng <chao.p.peng@linux.intel.com>
---
 hw/i386/pc_q35.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

Comments

Michael S. Tsirkin Nov. 6, 2016, 7:06 a.m. UTC | #1
On Sat, Nov 05, 2016 at 03:19:51AM -0400, Chao Peng wrote:
> This patch introduces a light weight machine type which shares the
> same codebase with existing q35 machine type but with some features
> disabled by default.
> 
> Signed-off-by: Chao Peng <chao.p.peng@linux.intel.com>

I don't find this too useful, but if others do and send acks, I'll merge
it, but only if it also has migration disabled.

> ---
>  hw/i386/pc_q35.c | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index d042fe0..1c6b476 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -276,6 +276,15 @@ static void pc_q35_init(MachineState *machine)
>      }
>  }
>  
> +static void pc_q35_lite_init(MachineState *machine)
> +{
> +    PCMachineState *pcms = PC_MACHINE(machine);
> +
> +    pcms->smbus = false;
> +    pcms->sata = false;
> +    pcms->pit = false;
> +}
> +
>  #define DEFINE_Q35_MACHINE(suffix, name, compatfn, optionfn) \
>      static void pc_init_##suffix(MachineState *machine) \
>      { \
> @@ -301,6 +310,15 @@ static void pc_q35_machine_options(MachineClass *m)
>      m->max_cpus = 288;
>  }
>  
> +static void pc_q35_lite_machine_options(MachineClass *m)
> +{
> +    pc_q35_machine_options(m);
> +    m->alias = "q35-lite";
> +}
> +
> +DEFINE_Q35_MACHINE(lite, "pc-q35-lite", pc_q35_lite_init,
> +                   pc_q35_lite_machine_options);
> +
>  static void pc_q35_2_8_machine_options(MachineClass *m)
>  {
>      pc_q35_machine_options(m);
> -- 
> 1.8.3.1
Paolo Bonzini Nov. 7, 2016, 5:09 p.m. UTC | #2
On 06/11/2016 08:06, Michael S. Tsirkin wrote:
> On Sat, Nov 05, 2016 at 03:19:51AM -0400, Chao Peng wrote:
>> > This patch introduces a light weight machine type which shares the
>> > same codebase with existing q35 machine type but with some features
>> > disabled by default.
>> > 
>> > Signed-off-by: Chao Peng <chao.p.peng@linux.intel.com>
> I don't find this too useful, but if others do and send acks, I'll merge
> it, but only if it also has migration disabled.
> 

Agreed, it's enough to have patches 1-3.

Paolo
Chao Peng Nov. 14, 2016, 8:06 a.m. UTC | #3
On Mon, 2016-11-07 at 18:09 +0100, Paolo Bonzini wrote:
> 
> On 06/11/2016 08:06, Michael S. Tsirkin wrote:
> > 
> > On Sat, Nov 05, 2016 at 03:19:51AM -0400, Chao Peng wrote:
> > > 
> > > > 
> > > > This patch introduces a light weight machine type which shares
> > > > the
> > > > same codebase with existing q35 machine type but with some
> > > > features
> > > > disabled by default.
> > > > 
> > > > Signed-off-by: Chao Peng <chao.p.peng@linux.intel.com>
> > I don't find this too useful, but if others do and send acks, I'll
> > merge
> > it, but only if it also has migration disabled.
> > 
> 
> Agreed, it's enough to have patches 1-3.
> 

I'm fine.
Michael S. Tsirkin Nov. 14, 2016, 8:51 p.m. UTC | #4
On Mon, Nov 14, 2016 at 04:06:02PM +0800, Chao Peng wrote:
> On Mon, 2016-11-07 at 18:09 +0100, Paolo Bonzini wrote:
> > 
> > On 06/11/2016 08:06, Michael S. Tsirkin wrote:
> > > 
> > > On Sat, Nov 05, 2016 at 03:19:51AM -0400, Chao Peng wrote:
> > > > 
> > > > > 
> > > > > This patch introduces a light weight machine type which shares
> > > > > the
> > > > > same codebase with existing q35 machine type but with some
> > > > > features
> > > > > disabled by default.
> > > > > 
> > > > > Signed-off-by: Chao Peng <chao.p.peng@linux.intel.com>
> > > I don't find this too useful, but if others do and send acks, I'll
> > > merge
> > > it, but only if it also has migration disabled.
> > > 
> > 
> > Agreed, it's enough to have patches 1-3.
> > 
> 
> I'm fine.

Pls post just the correct patches after the release.
Paolo Bonzini Dec. 14, 2016, 4:58 p.m. UTC | #5
On 14/11/2016 21:51, Michael S. Tsirkin wrote:
> On Mon, Nov 14, 2016 at 04:06:02PM +0800, Chao Peng wrote:
>> On Mon, 2016-11-07 at 18:09 +0100, Paolo Bonzini wrote:
>>>
>>> On 06/11/2016 08:06, Michael S. Tsirkin wrote:
>>>>
>>>> On Sat, Nov 05, 2016 at 03:19:51AM -0400, Chao Peng wrote:
>>>>>
>>>>>>
>>>>>> This patch introduces a light weight machine type which shares
>>>>>> the
>>>>>> same codebase with existing q35 machine type but with some
>>>>>> features
>>>>>> disabled by default.
>>>>>>
>>>>>> Signed-off-by: Chao Peng <chao.p.peng@linux.intel.com>
>>>> I don't find this too useful, but if others do and send acks, I'll
>>>> merge
>>>> it, but only if it also has migration disabled.
>>>>
>>>
>>> Agreed, it's enough to have patches 1-3.
>>>
>>
>> I'm fine.
> 
> Pls post just the correct patches after the release.

Since I was cleaning my inbox, I've already queued 1-3.

Paolo
diff mbox

Patch

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index d042fe0..1c6b476 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -276,6 +276,15 @@  static void pc_q35_init(MachineState *machine)
     }
 }
 
+static void pc_q35_lite_init(MachineState *machine)
+{
+    PCMachineState *pcms = PC_MACHINE(machine);
+
+    pcms->smbus = false;
+    pcms->sata = false;
+    pcms->pit = false;
+}
+
 #define DEFINE_Q35_MACHINE(suffix, name, compatfn, optionfn) \
     static void pc_init_##suffix(MachineState *machine) \
     { \
@@ -301,6 +310,15 @@  static void pc_q35_machine_options(MachineClass *m)
     m->max_cpus = 288;
 }
 
+static void pc_q35_lite_machine_options(MachineClass *m)
+{
+    pc_q35_machine_options(m);
+    m->alias = "q35-lite";
+}
+
+DEFINE_Q35_MACHINE(lite, "pc-q35-lite", pc_q35_lite_init,
+                   pc_q35_lite_machine_options);
+
 static void pc_q35_2_8_machine_options(MachineClass *m)
 {
     pc_q35_machine_options(m);